From eb71cd195af44bf7c5a9dbcad806dc738ae9b7d3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 11 Oct 2017 19:33:43 -0500
Subject: [PATCH] testsuite: cosmetics

Put all tests in a suite, and order them in a nicer way.
This makes the test output look better.
---
 testsuite/a11y/meson.build       | 3 ++-
 testsuite/css/meson.build        | 2 +-
 testsuite/css/nodes/meson.build  | 2 +-
 testsuite/css/parser/meson.build | 2 +-
 testsuite/css/style/meson.build  | 2 +-
 testsuite/meson.build            | 6 +++---
 testsuite/tools/meson.build      | 3 ++-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index 6a3a17e588..f4688b985b 100644
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -21,7 +21,8 @@ foreach t: a11y_tests
                     install_dir: testexecdir,
                     dependencies: libgtk_dep),
         args: [ '--tap', '-k', ],
-        env: installed_test_env)
+        env: installed_test_env,
+        suite: 'a11y')
 endforeach
 
 a11y_installed_tests = [
diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build
index 5df0da85cd..de9b12329f 100644
--- a/testsuite/css/meson.build
+++ b/testsuite/css/meson.build
@@ -6,7 +6,7 @@ test_api = executable('api', 'api.c',
                       install: get_option('install-tests'),
                       install_dir: join_paths(installed_test_bindir, 'css'),
                       dependencies: libgtk_dep)
-test('css/api', test_api)
+test('api', test_api, suite: 'css')
 
 if get_option('install-tests')
   conf = configuration_data()
diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
index e0f63b75d5..9dbbd48e2c 100644
--- a/testsuite/css/nodes/meson.build
+++ b/testsuite/css/nodes/meson.build
@@ -3,7 +3,7 @@ test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
                         dependencies: libgtk_dep)
-test('css/nodes/test-nodes', test_nodes)
+test('test-nodes', test_nodes, suite: 'css')
 
 test_data = [
   'box.ltr.nodes',
diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build
index ef953f999a..3ea4bf013a 100644
--- a/testsuite/css/parser/meson.build
+++ b/testsuite/css/parser/meson.build
@@ -4,7 +4,7 @@ test_parser = executable('test-css-parser', 'test-css-parser.c',
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
                          dependencies: libgtk_dep)
-test('css/parser/css-parser', test_parser)
+test('css-parser', test_parser, suite: 'css')
 
 test_data = [
   'animation-crash-3.12.css',
diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build
index 0554aad1d5..248e52a4bd 100644
--- a/testsuite/css/style/meson.build
+++ b/testsuite/css/style/meson.build
@@ -14,7 +14,7 @@ test_style = executable(
   install_dir: testexecdir,
   dependencies: libgtk_dep,
 )
-test('css/style/test-style', test_style)
+test('test-style', test_style, suite: 'css')
 
 test_data = [
   'adjacent-states.css',
diff --git a/testsuite/meson.build b/testsuite/meson.build
index f9b97da586..fa283dd65c 100644
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -11,10 +11,10 @@ installed_test_env = [
   'G_ENABLE_DIAGNOSTIC=0',
 ]
 
+subdir('gdk')
 subdir('gsk')
-subdir('tools')
 subdir('gtk')
-subdir('gdk')
 subdir('css')
 subdir('a11y')
-subdir('reftests')
+subdir('tools')
+#subdir('reftests')
diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build
index d705601c62..316b0b64c5 100644
--- a/testsuite/tools/meson.build
+++ b/testsuite/tools/meson.build
@@ -12,7 +12,8 @@ if bash.found()
     test('test-@0@'.format(t), bash,
       args : 'test-@0@'.format(t),
       workdir : meson.current_build_dir(),
-      env : test_env)
+      env : test_env,
+      suite: 'tools')
   endforeach
 endif # bash found
 
-- 
2.30.2